Skip to content

chore: Merging from main branch#664

Closed
Prekshith-Microsoft wants to merge 15 commits into
devfrom
macae-v2
Closed

chore: Merging from main branch#664
Prekshith-Microsoft wants to merge 15 commits into
devfrom
macae-v2

Conversation

@Prekshith-Microsoft

@Prekshith-Microsoft Prekshith-Microsoft commented Nov 26, 2025

Copy link
Copy Markdown
Contributor

This pull request updates the deployment workflows to target the new macae-v2 branch and refactors deployment logic and parameters for improved clarity and consistency. The changes also update how container image tags are assigned and used in deployments, and include a minor documentation fix.

Workflow and Branch Updates:

  • Changed the target branch for both .github/workflows/deploy.yml and .github/workflows/deploy-waf.yml from main (and hotfix) to macae-v2, ensuring deployments are only triggered for the new branch. [1] [2]

Deployment Logic and Parameter Refactoring:

  • Updated image tag assignment logic in deploy.yml to only handle macae-v2 and dev branches, removing the hotfix branch and commented out the default case.
  • Split the container image tag parameter in the Bicep deployment command into backendContainerImageTag and frontendContainerImageTag for more granular control.

Parameter Cleanup:

  • Removed unused timestamp generation and tag parameters from both deployment workflows, cleaning up the deployment command. [1] [2] [3]

Documentation:

  • Fixed a documentation step in docs/quota_check.md to ensure users navigate into the infra directory before accessing scripts.## Purpose
  • ...

Does this introduce a breaking change?

  • Yes
  • No

How to Test

  • Get the code
git clone [repo-address]
cd [repo-name]
git checkout [branch-name]
npm install
  • Test the code

What to Check

Verify that the following are valid

  • ...

Other Information

Roopan-Microsoft and others added 15 commits September 1, 2025 16:00
@Roopan-Microsoft
Merge pull request #414 from microsoft/dev
427f019 
fix: Reverted the Planner agent prompt changes
@Harmanpreet-Microsoft
Update quota_check.md to include infra directory step
9682e6a 
Added a step to navigate to the 'infra' directory before accessing the 'scripts' folder.
@Roopan-Microsoft
Merge pull request #424 from microsoft/dev
96f6a36 
feat: merged to main from dev
@Harmanpreet-Microsoft
Update image tags for backend and frontend containers
8c39455
@Roopan-Microsoft
Merge pull request #441 from Harmanpreet-Microsoft/main
71a0e00 
ci: Update image tags for backend and frontend containers
@Roopan-Microsoft
Merge pull request #439 from microsoft/dev
492517f 
chore: Dev to Main changes merge
@Roopan-Microsoft
Merge pull request #462 from microsoft/dev
fc6d1d2 
fix: merge Cosmos DB issue fixes from dev into main
@Roopan-Microsoft
Merge pull request #422 from microsoft/psl-updatemdfile
a211e49 
docs: clarify navigation by adding step to enter 'infra' directory before 'scripts'
@Roopan-Microsoft
Merge pull request #496 from microsoft/dev
71d7c60 
chore: merging dev changes to main branch
@Roopan-Microsoft
Merge pull request #525 from microsoft/dev
85ec07d 
fix: Dev to macae-v2 branch
@Roopan-Microsoft
Update deploy.yml
7169d8c
@Roopan-Microsoft
Update WAF deployment workflow for new branch and version
54e0435
@Roopan-Microsoft
Update deploy.yml for workflow_dispatch comment
c56cbc6
@Roopan-Microsoft
Merge pull request #539 from microsoft/dev
d1dbe06 
refactor: merge dev into main
@Roopan-Microsoft
Merge pull request #575 from microsoft/dev
2fc2c25 
fix: Dev to macae-v2 merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Avijit-Microsoft Avijit-Microsoft Awaiting requested review from Avijit-Microsoft Avijit-Microsoft is a code owner

@Roopan-Microsoft Roopan-Microsoft Awaiting requested review from Roopan-Microsoft Roopan-Microsoft is a code owner

@Prajwal-Microsoft Prajwal-Microsoft Awaiting requested review from Prajwal-Microsoft

@marktayl1 marktayl1 Awaiting requested review from marktayl1 marktayl1 is a code owner

@Fr4nc3 Fr4nc3 Awaiting requested review from Fr4nc3 Fr4nc3 is a code owner

@Vinay-Microsoft Vinay-Microsoft Awaiting requested review from Vinay-Microsoft

@aniaroramsft aniaroramsft Awaiting requested review from aniaroramsft aniaroramsft is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Prekshith-Microsoft @Prajwal-Microsoft @Roopan-Microsoft @Harmanpreet-Microsoft